* lisp/frame.el (automatic-hscrolling): Make this alias obsolete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0f42ba6ff78e79e9a7c45d12076610e2e872995..97d626f950535607c624b42f9142a9b9c157afaa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-16  Glenn Morris  <rgm@gnu.org>
+
+       * frame.el (automatic-hscrolling): Make this alias obsolete.
+
 2012-04-12  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
        * ispell.el (ispell-set-spellchecker-params): Post-process

diff --git a/lisp/frame.el b/lisp/frame.el
index 79e1243c7af50f3e321be199014391c606d42d61..1ee9d966ef1da4e440695549bad87dc2c0cc4255 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1651,7 +1651,8 @@ terminals, cursor blinking is controlled by the terminal."
 \f
 ;; Misc.
 
-(defvaralias 'automatic-hscrolling 'auto-hscroll-mode)
+;; Only marked as obsolete in 24.2.
+(define-obsolete-variable-alias 'automatic-hscrolling 'auto-hscroll-mode "22.1")
 
 (make-variable-buffer-local 'show-trailing-whitespace)